merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 18 May 2011 05:58:40 +0000 (14:58 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 18 May 2011 05:58:40 +0000 (14:58 +0900)
commitc76c60ca0b2156817e19e1076c96a73808b796a9
tree928dccefcf2c7dc40400ad96732cda8c323d1133
parenta8ebe7dd43cd84ce17aa762c82bdd91aeb76e095
parent2ab24660395f74f0984826a899637770d0d9461d
merge trunk